The actual implementation here looks good to me. The one thing I noticed is there's a bunch of commented out code floating around, which I find to be bad practice - if that's something that might get added/restored in the future, I'd rather see a standalone commit that just removes the unused functionality and can later be reverted over scattered blocks of commented code

Yeah. I have a tendency to lave these ideas around in comments, but you are right and 9 out of 10 times I never follow up on them.

I'll clean it up before merging.